Set scale_num only once

This modifies the previous commit to be according the upstream libjpeg
maintainers recommendations. See bug 588740.

diff --git a/gdk-pixbuf/io-jpeg.c b/gdk-pixbuf/io-jpeg.c
index 07308e3706540ed077a816fb8b193c06a76248e1..c2c5ab9f3ddc006bd4c84586d2019b48bc763b46 100644 (file)
--- a/gdk-pixbuf/io-jpeg.c
+++ b/gdk-pixbuf/io-jpeg.c
@@ -921,8 +921,8 @@ gdk_pixbuf__jpeg_image_load_increment (gpointer data,
                                }
                        }
                        
+                       cinfo->scale_num = 1;
                        for (cinfo->scale_denom = 2; cinfo->scale_denom <= 8; cinfo->scale_denom *= 2) {
-                               cinfo->scale_num = 1;
                                jpeg_calc_output_dimensions (cinfo);
                                if (cinfo->output_width < width || cinfo->output_height < height) {
                                        cinfo->scale_denom /= 2;